LINUX: x86_64: start_pfn should be initialised even when XENFEAT_auto_translated_phys...

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
index dbb1bc39fedafe1639f868c15d4a649ee6882dd4..356c0717ff57cc7ccf58a239e677c2ea8e9b335f 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
@@ -105,13 +105,11 @@ void __init x86_64_start_kernel(char * real_mode_data)
        int i;
 
        xen_start_info = (struct start_info *)real_mode_data;
-       if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (!xen_feature(XENFEAT_auto_translated_physmap))
                phys_to_machine_mapping =
                        (unsigned long *)xen_start_info->mfn_list;
-               start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
-                       xen_start_info->nr_pt_frames;
-       }
-
+       start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
+               xen_start_info->nr_pt_frames;
 
        machine_to_phys_mapping = (unsigned long *)MACH2PHYS_VIRT_START;
        machine_to_phys_nr_ents = MACH2PHYS_NR_ENTRIES;